Use $PKG_CONFIG, not pkg-config. (#51032)

Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
	not pkg-config. (#51032)

	* gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
	(fixes #51952, James Henstridge)

diff --git a/ChangeLog b/ChangeLog
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1f4e579bf3d71e266bae25921b2153ef11fe5a5d..3c02a85d0ec3aed48f098994d81b58b2d32dcd36 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue May 29 17:40:29 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in (GTK_DEP_CFLAGS): Use $PKG_CONFIG,
+       not pkg-config. (#51032)
+
+       * gdk/gdkproperty.h: Remove inappropriate G_GNUC_CONST
+       (fixes #51952, James Henstridge)
+       
 2001-05-27  Alexander Larsson  <alla@lysator.liu.se>
 
        * gtk/gtkstock.h (GTK_STOCK_GO_UP):

diff --git a/configure.in b/configure.in
index 58e8015e74f21e51744deebd9aefcffccc4786ec..64d5738953dab68740dba28983e94ed16d04b739 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -622,8 +622,8 @@ AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
-GDK_PIXBUF_DEP_LIBS="`pkg-config --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`pkg-config --cflags $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PIXBUF_PACKAGES)
 AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
@@ -798,8 +798,8 @@ fi
 AC_SUBST(xinput_progs)
 
 GDK_PIXBUF_XLIB_PACKAGES=
-GDK_PIXBUF_XLIB_DEP_LIBS="`pkg-config --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_XLIB_DEP_CFLAGS="`pkg-config --cflags  $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
+GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PIXBUF_XLIB_PACKAGES)
 AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_LIBS)
@@ -891,8 +891,8 @@ CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES=$PANGO_PACKAGES
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `pkg-config --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_DEP_CFLAGS="`pkg-config --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PACKAGES)
 AC_SUBST(GDK_EXTRA_LIBS)
@@ -927,8 +927,8 @@ AC_CHECK_LIB(atk, atk_object_get_type, : , AC_MSG_ERROR([
 GTK_PACKAGES=atk
 GTK_EXTRA_LIBS=
 GTK_EXTRA_CFLAGS= 
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS `pkg-config --libs $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-GTK_DEP_CFLAGS="`pkg-config --cflags  $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  $GTK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)

diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 2255d30d3c4bb71ae1163a8f8af127651482cad6..0a6d45f32865bc338eb1ae75eef441843d23c468 100644 (file)
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -16,7 +16,7 @@ typedef enum
 
 GdkAtom gdk_atom_intern (const gchar *atom_name,
                         gboolean     only_if_exists);
-gchar*  gdk_atom_name   (GdkAtom      atom) G_GNUC_CONST;
+gchar*  gdk_atom_name   (GdkAtom      atom);
 
 gboolean gdk_property_get    (GdkWindow     *window,
                              GdkAtom        property,